From: Joakim Verona Date: Wed, 14 Aug 2013 09:26:46 +0000 (+0200) Subject: merge from trunk X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=072a48a94b57625678e2e7e24a3d9464e3b0cb60;p=emacs.git merge from trunk --- 072a48a94b57625678e2e7e24a3d9464e3b0cb60